Handle the Cancel button properly. (#304234, Sven Neumann)

2005-05-18  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkfilechooserbutton.c (dialog_response_cb): Handle the
	Cancel button properly.  (#304234, Sven Neumann)

diff --git a/ChangeLog b/ChangeLog
index 7ae8e6d8b301f4608c2f929d5c6894379ad25bde..aca2ba23a400cdbf71eeebc7d0ed825a8ad6a500 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-18  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkfilechooserbutton.c (dialog_response_cb): Handle the
+       Cancel button properly.  (#304234, Sven Neumann)
+
 2005-05-18  Anders Carlsson  <andersca@imendio.com>
 
        * gtk/gtktextview.c: (gtk_text_view_flush_scroll),
@@ -6,9 +11,9 @@
        If the horizontal adjustment changes because of a change in the
        layout width, then do a complete redraw. This is because there
        might be right-aligned or centered text that needs to be redrawn.
-       
-2005-05-18  Matthias Clasen  <mclasen@redhat.com>
 
+2005-05-18  Matthias Clasen  <mclasen@redhat.com>
+       
        * gtk/gtkwidget.c (gtk_widget_add_events): Try harder to set
        the event masks of descendent windows.  (#169821, Tommi Komulainen)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7ae8e6d8b301f4608c2f929d5c6894379ad25bde..aca2ba23a400cdbf71eeebc7d0ed825a8ad6a500 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-05-18  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkfilechooserbutton.c (dialog_response_cb): Handle the
+       Cancel button properly.  (#304234, Sven Neumann)
+
 2005-05-18  Anders Carlsson  <andersca@imendio.com>
 
        * gtk/gtktextview.c: (gtk_text_view_flush_scroll),
@@ -6,9 +11,9 @@
        If the horizontal adjustment changes because of a change in the
        layout width, then do a complete redraw. This is because there
        might be right-aligned or centered text that needs to be redrawn.
-       
-2005-05-18  Matthias Clasen  <mclasen@redhat.com>
 
+2005-05-18  Matthias Clasen  <mclasen@redhat.com>
+       
        * gtk/gtkwidget.c (gtk_widget_add_events): Try harder to set
        the event masks of descendent windows.  (#169821, Tommi Komulainen)
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7ae8e6d8b301f4608c2f929d5c6894379ad25bde..aca2ba23a400cdbf71eeebc7d0ed825a8ad6a500 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-05-18  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkfilechooserbutton.c (dialog_response_cb): Handle the
+       Cancel button properly.  (#304234, Sven Neumann)
+
 2005-05-18  Anders Carlsson  <andersca@imendio.com>
 
        * gtk/gtktextview.c: (gtk_text_view_flush_scroll),
@@ -6,9 +11,9 @@
        If the horizontal adjustment changes because of a change in the
        layout width, then do a complete redraw. This is because there
        might be right-aligned or centered text that needs to be redrawn.
-       
-2005-05-18  Matthias Clasen  <mclasen@redhat.com>
 
+2005-05-18  Matthias Clasen  <mclasen@redhat.com>
+       
        * gtk/gtkwidget.c (gtk_widget_add_events): Try harder to set
        the event masks of descendent windows.  (#169821, Tommi Komulainen)
 

diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index f0fe1630d0003a396cba3c12d018e39958c56ff7..3c38073db0fa098afe29df37f386a7a4414b2fba 100644 (file)
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -2165,6 +2165,8 @@ dialog_response_cb (GtkDialog *dialog,
          break;
        }
     }
+  else
+    gtk_file_chooser_unselect_all (GTK_FILE_CHOOSER (dialog));
 
   if (priv->old_path)
     {